Prepare for using the g_test_*() API reviewed by: Richard Hult

2008-08-15  Sven Herzberg  <sven@imendio.com>

	Prepare for using the g_test_*() API
	reviewed by: Richard Hult

	* gdk/tests/check-gdk-cairo.c: use assertions instead of returning an
	error code

svn path=/trunk/; revision=21132

diff --git a/ChangeLog b/ChangeLog
index bb4a66f86d30b37d61999843807e60b62b0c430a..550ec0a4a51caec6ef5428bf036ea32434a1a60f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-15  Sven Herzberg  <sven@imendio.com>
+
+       Prepare for using the g_test_*() API
+       reviewed by: Richard Hult
+
+       * gdk/tests/check-gdk-cairo.c: use assertions instead of returning an
+       error code
+
 2008-08-15  Claudio Saavedra  <csaavedra@igalia.com>
 
        Bug 547944 – Self-reference in gtk_page_setup_load_file's docs

diff --git a/gdk/tests/check-gdk-cairo.c b/gdk/tests/check-gdk-cairo.c
index 5986c06e693777d817fe46b2c92457872120772e..5a0307b989a07ff9fad6773166252c44ad5a8c7c 100644 (file)
--- a/gdk/tests/check-gdk-cairo.c
+++ b/gdk/tests/check-gdk-cairo.c
@@ -23,6 +23,7 @@
  * if advised of the possibility of such damage.
  */
 
+#include <glib/gstdio.h>
 #include <gdk/gdk.h>
 #ifdef CAIRO_HAS_QUARTZ_SURFACE
 #include <cairo-quartz.h>
@@ -106,18 +107,14 @@ main (int   argc,
                g_error ("Eeek! Error loading \"cairosurface.png\"");
        }
 
-       g_return_val_if_fail (gdk_pixbuf_get_width (pbuf_platform) ==
-                             gdk_pixbuf_get_width (pbuf_imagesrf),
-                             1);
-       g_return_val_if_fail (gdk_pixbuf_get_height (pbuf_platform) ==
-                             gdk_pixbuf_get_height (pbuf_imagesrf),
-                             1);
-       g_return_val_if_fail (gdk_pixbuf_get_rowstride (pbuf_platform) ==
-                             gdk_pixbuf_get_rowstride (pbuf_imagesrf),
-                             1);
-       g_return_val_if_fail (gdk_pixbuf_get_n_channels (pbuf_platform) ==
-                             gdk_pixbuf_get_n_channels (pbuf_imagesrf),
-                             1);
+       g_assert (gdk_pixbuf_get_width (pbuf_platform) ==
+                 gdk_pixbuf_get_width (pbuf_imagesrf));
+       g_assert (gdk_pixbuf_get_height (pbuf_platform) ==
+                 gdk_pixbuf_get_height (pbuf_imagesrf));
+       g_assert (gdk_pixbuf_get_rowstride (pbuf_platform) ==
+                 gdk_pixbuf_get_rowstride (pbuf_imagesrf));
+       g_assert (gdk_pixbuf_get_n_channels (pbuf_platform) ==
+                 gdk_pixbuf_get_n_channels (pbuf_imagesrf));
 
        data_platform = gdk_pixbuf_get_pixels (pbuf_platform);
        data_imagesrf = gdk_pixbuf_get_pixels (pbuf_imagesrf);
@@ -127,7 +124,7 @@ main (int   argc,
                        g_warning ("Eeek! Images are differing at byte %d", i);
                        g_object_unref (pbuf_platform);
                        g_object_unref (pbuf_imagesrf);
-                       return 1;
+                       g_assert_not_reached ();
                }
        }